Repository navigation
feat: show unfinished cherry-picks and reverts before continuing Pi - #87
Merged
Merged
Conversation
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Workspace status now shows an unfinished cherry-pick or revert before starting Pi and before continuing saved history. The notice remains after conflicts are staged and after a manual resolution commit when a multi-commit sequence still has work to apply.
Part of #1. Closes #86.
Inspection uses the selected worktree's Git directory, keeping linked worktrees independent and supporting nested roots. Merge and rebase notices retain precedence. Unreadable sequencer state produces an unavailable notice while file changes remain readable. The architecture documentation describes the added states.
Final verification on
28cc891used Node 22.23.0 and Bun 1.3.14 throughmise exec.mise exec -- bun install --frozen-lockfilepassed.mise exec -- bun run lintpassed.mise exec -- bun run typecheckpassed.mise exec -- bun run test:unitpassed, 114 tests across 10 files.mise exec -- bun run test:integrationpassed, 114 tests across 14 files.mise run buildpassed, including all gates and main, preload and renderer compilation.mise exec -- bun run test:e2epassed locally, 72 tests across 8 files.git diff --checkpassed.The new Electron scenario,
shows cherry-picks and reverts before new and saved continuation until abort, checks notices after staging all conflicts, focus refresh after abort, separate draft preservation, unchanged source history, no Pi execution, and desktop and native 900 by 600 layout bounds. A focused run passed all nine workspace-status Electron tests.New logic and component cases include the following.
detects $operation with sequence=$sequence in a linked worktree through resolution and cleanup, covering single cherry-pick/revert abort and multi-commit continuation after a manual resolution commit.keeps rebase precedence when it stops while applying a commit.keeps changes readable when sequencer state cannot be read.shows Cherry-pick in progress even after all root conflicts have been resolvedand its revert counterpart, covering new-session, collapsed history and expanded history status.The final hosted build gates passed. The final hosted Electron run, attempt 2 passed all 72 tests across 8 files on macOS.
Native screenshots from the first attempt on the final commit are uploaded in the pidex-e2e artefact. All nine workspace-status Electron tests passed in that run.
The ten added PNGs are under
test-results/workspace-status/in the artefact. Each operation has a desktop and minimum-window new-session capture, desktop and minimum-window collapsed history, and expanded minimum-window history.workspace-cherry-pick-in-progress.pngandworkspace-revert-in-progress.pngshow the notices after all conflicts are staged.workspace-cherry-pick-in-progress-narrow.pngandworkspace-revert-in-progress-narrow.pngshow the new-session view at 900 by 600.history-cherry-pick-in-progress-narrow.pngandhistory-revert-in-progress-narrow.pngshow the notice in collapsed history.history-cherry-pick-in-progress-expanded-narrow.pngandhistory-revert-in-progress-expanded-narrow.pngshow the guidance with transcript, draft and Resume available.Local Playwright capture succeeded and wrote the same images to
.tmp/proof/. Desktop cherry-pick/revert and minimum-window collapsed/expanded history were visually reviewed. The hosted artefact was downloaded and its desktop cherry-pick and expanded minimum-window revert captures were also visually reviewed. Inline image attachment was blocked by the unavailable browser host and Firefox native access returningcgWindowNotFound; the uploaded artefact supplies the PNGs. Scratch captures are not committed.Validation exposed two existing test races, fixed in separate test commits. The long-session test now waits for the live fork rather than accepting the already visible history preview, and the history-export test removes a previous scratch download before waiting for the new one. Before those fixes, local runs had three long-session failures and then one stale-export failure; the final full local run passed all 72 tests. An earlier hosted run also hit an Electron setup execution-context failure. The first hosted attempt on the final commit passed 64 tests and skipped eight after another Electron setup execution-context failure in the tool-preview suite. Rerunning that failed job without code changes passed all 72 tests. The uploaded screenshot proof comes from the first attempt, where all nine workspace-status tests passed.
This slice reports operation state. Git operation actions and patch-application notices remain follow-ups. Inspection keeps the existing focus, navigation and 15-second refresh. Parent #1 remains open.